@TomMalbran @larz0 I thought part of the reason we added this was a z-order fix of some sort... are we sure it's safe to remove now?  Looks like PR #4714 or #5085 maybe...