Revert "2014-0423-2110"

This reverts commit e0eb3974f46b07deac2c933a6fae31919b41b751.