This reverts commit 37b515f8, reversing
changes made to ffeeb901.

Please note that re-merging shall be done by reverting this revert and merging
back rest of bug_778748, as described in:
http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt