Revert 6590659..0bcc6ae

This rolls back to commit 6590659994364bc9bb05a46468838a59cab54507.