Revert r162101 and replace it with a solution that works for targets where the pointe...