Fixed grandparents merge conflict.
Moved code back to right place.