Drop #1148213 by @alexmack