yep, lets file a bug and remove the comment before landing this first part :)