#1682 
(just realized that I had created the issue before this had landed :P . Sorry about that)