Revert PR #3088 as discussed in #3265.

- Reverts a9aa0a2
- Reverts df6eb13
- Reverts 1ec40d0