Ok, let's take care of that in #2758.