Revert dc7f913..f475d02

This rolls back to commit dc7f91377377352e883084af121bb308ac80c7cd.