Merge the code for the new implementation but don't use it. The logic to enable it will be done separately.