Merge backout for test suite fix