Revert "20140518"

This reverts commit e5de9347ce4c2bb398dcbf45a17d8bcd2b509200.