Revert 80fda4b..c0aa141

This rolls back to commit 80fda4bd78c964ac65fb88d41d85b05cf9e7c36a.