Revert 878e9c5..c718ca2

This rolls back to commit 878e9c5599f45720f6f88312c226bf4349de9ffc.