Your change in #2690 is better :) - so let's remove this. This one doesn't quite make sense.