Back out this hard-cody-ness
Back out this hard-cody-ness

bodom0015/ndslabs,craig-willis/ndslabs,bodom0015/ndslabs,craig-willis/ndslabs,craig-willis/ndslabs,bodom0015/ndslabs,craig-willis/ndslabs,nds-org/ndslabs,bodom0015/ndslabs