Revert ff2c933..3cdfa31

This rolls back to commit ff2c9331254266ad81364fd33bbb754bff58b737.