Merge pull request #879 from nico/rev
authorNico Weber <nicolasweber@gmx.de>
Thu, 4 Dec 2014 02:17:27 +0000 (18:17 -0800)
committerNico Weber <nicolasweber@gmx.de>
Thu, 4 Dec 2014 02:17:27 +0000 (18:17 -0800)
Revert #223, fixes #874.


Trivial merge