Revert the changes needed to fix #3293.