I'd prefer the former, that's one of the reasons the bypass transfer was implemented - to have identical behaviour to the current implementation.

The new implementation is more than the former, so I think it should replace the old one in time.