Revert "Changed order of calls to register new nodes"

Closes-bug: #1333629
This reverts commit 779afd8882b119f7fc4eb69b3edd3e9efd63b42d.

Change-Id: I1d292bd771e7f5a097bf84d8ec878085d3e645c9
Merge "Revert "Changed order of calls to register new nodes""