Revert "20140901dev"

This reverts commit 4e49cdcee4dc9f43d4aab6bbf1fd6e017b56212d.