Rollback some parts of this change