This reverts commit 2d4d3f5fce. Reverts #2146. I think #2135 (e329e83) and #2146 (2d4d3f5) are my mistakes. CORE-16552, CORE-16747
2d4d3f5fce
e329e83
2d4d3f5