Revert "Merge commit '54d318a27f6565f5ae98208174e4ed9803b33ff1' into opendingux-2012.11"

This reverts commit d68f8e3843b17d9e2a6f1ec80ad0c6c643db0dcd, reversing
changes made to 54d318a27f6565f5ae98208174e4ed9803b33ff1.