Revert 9cd5e9e..d2033fc

This rolls back to commit 9cd5e9efc3e2ba1503c477552b9026a46c928394.