Revert 7fd7704..5669eed

This rolls back to commit 7fd770486f3ebc144e66bc93e0e30eaabae4cd36.