Revert 9684bb3..3a2b49a

This rolls back to commit 9684bb3821e5834ee30e9ca0bbbcd6b452b34367.