Credit @xantares for goldenmoustache (#4128)