Revert 6c280e8..00e12b9

This rolls back to commit 6c280e86ecdd79122d57bf4e7efac30875dd69bd.