re-add proper get_rot_since arguments lost in merge