well... / #5592

This is really sorry, but such is live :(

I will probably revert some of the forward comment code because it the request comment is a much better solution.