Revert r195318 as it causes miscompilation (PR18029)