Revert arm7-a-neon commit's.
** This was causing breaks to build.