Revert 6bc5fe8..ecf011f

This rolls back to commit 6bc5fe87eac1f462fccf465f5cea54390a49b5f2.