We can actually kill this comment, since it was there to indicate that placing the docs inside the conditional was intentional. Once 1.8 is gone we won't need to do that any more.