Drop #1053579 by @TarainAbstract