Revert part of r166049 back and enable test case in r166125.