rolling back some janky changes for now