Revert r18344. Fixes at least issue 1218, 1221, and 1187), see master