Merge "Partial revert of 2fabea7eea556aba6eda9b3385d9844123328482"
authorReedy <reedy@wikimedia.org>
Mon, 20 Aug 2012 22:08:45 +0000 (22:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 20 Aug 2012 22:08:45 +0000 (22:08 +0000)

Trivial merge