Drop #1031138 by @no0where