Drop #1162128 by @mingt