Revert API changes, introduce new API with additional parameter
Fix SemVer violation in 5.24.
We will want to a dot release for this as well.
QA Test Steps
FYI, a request has been made for this to be a dot release.