Revert ceff29a..df8672a

This rolls back to commit ceff29a3889e2f0dfd0dc195fd0efd84829e172d.