As suggested by Marcos Felipe Rasia de Mello <marcosfrm@gmail.com>. (cherry picked from commit b50191c2)