I don't think it will be easy to correctly determine when it should be there and when it should not be. The reason it was removed earlier was because of the bug fixed in the issue.