revert shenanigans from old staging module