Can we clean this up the same as the other PR?