Revert e22a691..a46e8e7

This rolls back to commit e22a6919f56094fb5d10c47a9c7cc3455bdc4a35.