Revert previous change and add flag to be consitent with previous code, and potentially easier to debug