Revert 8e2c665..f2dc2f1

This rolls back to commit 8e2c665769593a281a3d02569a0ed56e60942d08.