Drop #976753 by @Ebrahim