Revert ef6f13b..e121d4b

This rolls back to commit ef6f13be9d9becae45e8822e54fd77bab8c97812.