Drop #1032771 by @Choen