Based on the patch on Bugzilla by
Marcos Paulo de Souza <marcos.souza.org@gmail.com>

Change-Id: I215b83894f228b1cc8908f98858b85c8d5378ddb