Revert "Revert "Revert "QTPFS NodeLayer minor"""

This reverts commit 22b38c7236fea824984636738d9f13483b1014da.
...