This reverts commit 57b9105c. Issue #2682 is fixed, so we can revert the commit as planned. This re-applies a previously-reverted modernization.