Revert 566de70..94a76c7

This rolls back to commit 566de700ba4ad9a8b187763a9e2d83a4719d0f68.