Revert b73ca3d..54ec25d

This rolls back to commit b73ca3d03cb8d4bbd40cf459e73957e30e73ab30.