Revert 3931f04..9def405

This rolls back to commit 3931f043b764c2490358a09a4b17de45ce1935ca.