Drop #982647 by @ricardotakamura