Revert "Revert "Patch for bug #1127710 (https://bugs.launchpad.net/linuxmint/+bug/1127710)""

This reverts commit 3ab39cf8becd5412b5bad73519842b907554b63b.