Revert a22df91..ebb5301

This rolls back to commit a22df911481d8635ca4fad39601394e330b7aae7.