Revert 7d7e5b8..81a9f91

This rolls back to commit 7d7e5b8e586c4b010eb29bd9b272582a4052083c.