This reverts commit 95100cd0. We already had a check that took care of this in an architecture independent way. See 452ac521 Closes #1750