Revert "Revert "Work 2014-10-24""

This reverts commit 834a58554a538bd9b8bfeccdb95b23de1983b320.