Revert c0a95e4..56095cd

This rolls back to commit c0a95e4ef8cb17c1fbf7bbf8e81964e5ec39490b.