more workaround for our backwards compat with package organization