67391744 popquiz rollover

@hkal https://www.pivotaltracker.com/story/show/67391744