Drop #996243 by @Paddy