move 'back-shifting' all to the same funciton refs #3308