Revert 01f86ee..c809653

This rolls back to commit 01f86eea067e2a3d91a1ffa04d85cf76eab7d23e.