Restore the move of the ruby logic