This reverts commit 0d748b4d. This is causing some failures when building Spec2017 with scalable vectors. Reverting to investigate.