Revert a169bc9..80585f3

This rolls back to commit a169bc9950b17f1e9a9c00cea24a2a1807a626d9.