Revert fe2a80d..b298352

This rolls back to commit fe2a80d8518619da2010b3bdc1b936b1a8ed4941.