Bug#788102: not fixed

[Mathieu Malaterre]

Control: reopen -1

Previous patch disabled the functionality completely. We should use
Steven's patch instead. Re-opening issue (Thanks Steven!)