Can you add a todo to change this back when dartbug.com/6111 is fixed?