See #9818, 60f63b0, #3121. I literally have this prototyped, just need to check it in. It's important for future issues...