I think this change will mess up our doc builds. I'll have to test it and see.