Yes, I am going to merge them both simultaneously. (I had reverted it back to the legacy one in this PR, but I must have rolled back that commit on accident.)