ARMS-285. moved timestamp move so always enacted.