BugLink: http://bugs.launchpad.net/bugs/1584163

This reverts commit d5e333e3.

Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>