Merge "Revert r97711"
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 10 May 2012 23:00:50 +0000 (23:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 May 2012 23:00:50 +0000 (23:00 +0000)

Trivial merge