Temporary fix to make the test suite pass in 1.8.7