This reverts commit 05908ffa [formerly a8b54d55], reversing changes made to b2a24b9e [formerly ad7dbb4f]. Former-commit-id: 1da4678a