Revert b6bf2aa..c39157a

This rolls back to commit b6bf2aaf605fe2d047cfcb82b7bbb5a20f996cc3.