Revert "20130507"

This reverts commit 1fc3fe31bcd125be9b8aa36bead101646a55b452.