Revert 6ea6b27..1ab9dd8

This rolls back to commit 6ea6b2738c9c7c918935d6c26dc3791ff128f98e.