Fixing NMS-6083: parent-foreign-source is not working anymore

DO NOT ATTEMPT TO MERGE THIS INTO 1.12 OR MASTER.