Revert df66f64..d6e6b37

This rolls back to commit df66f644f83da975a84113533ecca0176f2bc5e3.