Revert db5b44c..59c2610

This rolls back to commit db5b44c4499b3c93ddf0c79776eeca904aa4c7e8.