Revert 50b7be8..60efe70

This rolls back to commit 50b7be80e704c636de24334be5ca548f715ec7d7.