Revert a8d0c7c..cd758da

This rolls back to commit a8d0c7ca8c55047210c53e91fa0c85d06c484468.