This reverts commit ad9e82d4.
@mattwala Why? This seemed like a reasonable idea.
mentioned in commit 500acce2
Mentioned in commit 500acce2