We also fix http://bugzil.la/919004 here.