Comment by NathanCH

Why not simplify this and make it opt-in?