Drop #990241 by @kristopher