reverting #2259 temporarily until we figure out why logs aren't showing up