For the sake of moving this PR forwards, I've reverted this change.