Revert "20130517"

This reverts commit 57b023e2dc9d4c470831ac8cccc12eafa2061944.