Revert 293c3a3..f7f8c2d

This rolls back to commit 293c3a39317e86f09d7b0d921543c62429fa0389.