Revert a17ffb6..c42652a

This rolls back to commit a17ffb6d68fdcc650cbe1ee72542a6d3d7b11663.