I agree. It was ment as a fix for 2.1, since rest of the world move on some time ago.