Revert 69173e5..301819b

This rolls back to commit 69173e558f2d073e7358810933a19d5aabb7cedc.