Revert 5fe67f9..ecbbe05

This rolls back to commit 5fe67f97e19640ab75f21b93ee96c36c46dc99f8.