Revert "2014/06/12"

This reverts commit 9d890cc97917b18302ec0a2f4ecd2afae305698b.