Revert "Fix for T14251 on ARM"

Authored by bgamari on Nov 7 2018, 7:05 AM.