This reverts commit af03f7fb. Looks like the test is passing in some architectures. Reverting to green.