Revert 2b0a834..744d405

This rolls back to commit 2b0a834b4d44c0af928f06cc4956622d97306dc0.