Revert build for armv7s too