Add @willkg for #1007 thanks!