Revert "Commit on May 8, 2013"

This reverts commit 6e6ea4c92efbbdb1f9465e2a5ee5fd00c3830d57.