Found this stale branch, which should be removed safely as !2162 (merged) completely includes this patch.