Should this change and the docs change below be checked in? I don't see how they are related.