[package] revert 17050 this was not the right way to fix this