Rollback of breaking change.