Revert r191049/r191059 as it can produce wrong code (see PR17975).