Revert "Revert "Revert "Revert "Revert "2014-10-29"""""

This reverts commit 533fd78a32557ded100f220dd6549baa464dd69f.