Revert b9f2db9..69ba76b

This rolls back to commit b9f2db9245fa6b29bef4af64966c3ac34d28067b.