Reverting using nodec3 as part of multi-node sanity

Change-Id: Idba1adb649c47f106f925763de3f7a16ab2d33af
Merge "Reverting using nodec3 as part of multi-node sanity"
Merge remote-tracking branch 'upstream/master'