[dev][stable][release][manila] Should we revert these stable branch backports?