Revert part of dbf72357cb4a that is in a rarely used path and causes
maintenance issues (cost/benefit).
1 file changed