Revert "2014-0916---1"

This reverts commit 68a5b069a393d4ff9cfd8e25cfec18a1ed713c7d.