Revert 7c70757..db5edb5

This rolls back to commit 7c707571992b7fc4de966a634d29211a4bcee05b.