Revert "2014-11-21-14:38"

This reverts commit 216d019c27639098985525467fa67b152f04fee8.