This reverts commit 5ce784d816d1d076374456e8e2310c9da0586170.
This reverts commit 5497c3aa3ac3992cad48ed7875725186578356dd.
Revert the two chagnes that were used to disable rax and then force rax
under base-test for testing. The testing performed after that change
landed seems to indicate things are working.
Change-Id: Ibc3e71399205895d1508786f1eb40cb13d44817a