Revert b2ab051..cdd5cac

This rolls back to commit b2ab051c0cd912d0bdd346a450f4d2e69781960d.