Revert "20140606"

This reverts commit 5dd25f2cfa6af995e13107e75402434424d87fa8.