This reverts commit 99229c71. Assembly syntax issue with the Mac build. Change-Id: I271d18d31963fae46e4077ddd39313bec0b3a39e