**(non-blocker)** This comment no longer seems useful, so there's no need to drag it across with the rest of the code.