Revert d5bf742..c2a3035

This rolls back to commit d5bf74261f3328d5fd76646a4fc0e66c06cdc873.