Revert dd7a60f..6e1801c

This rolls back to commit dd7a60f9702a71745021ca17c154e48fef2dcd84.