This reverts commit b743850b736e4a89378be8bed61c1b3489b56d19. This didn't produce the expected result.