revert package compile breakage introduced in [6936]