Drop #1152154 by @intrepid