This reverts commit b1878b46. This does fix the test but it means that ac73b73c is not implemented correctly. Reverting for now, and will be reverting the commit that causes this to fail.
