fixes unnecessary BC breaking changes made by 69ba3a2