Build 61.13: More reliable way of configuring NodeM