Revert 413ee2a..eccef89

This rolls back to commit 413ee2a9708aa6040d9ed408764d6f09f989603f.