Drop #1095884 by @goppie