Updated to make the new behavior toggleable. Defaults to False (old behavior)