Revert 817896b..5864f53

This rolls back to commit 817896bf2d04f7dd8a224e82de78c53659d825ab.