r24518: get rid of using ->{ORIGINAL} and move stuff