Reverting changes for 4121 and turning it off.  I can't get it working correctly for both Debug and Release.