This reverts commit fc1eaeb7 [formerly 5c17579c], reversing changes made to d397ef14 [formerly 66157e9a]. Former-commit-id: 6ee0d719