Revert 1025526..8e4641c

This rolls back to commit 1025526514efc243a26fa3d4dd8ee23d06887159.