Revert d0910cb..74953c3

This rolls back to commit d0910cb21b15dced148aa975a34fa5bfed0e6e9d.