Revert 6e62be5..01a27af

This rolls back to commit 6e62be5ff05dad41ebd068de66de45a691697258.