Revert dfcaa82..6942c53

This rolls back to commit dfcaa82a719c880e18949cd56eb4253893eda513.