This reverts commit 12130c8006. Manual testing found this to not fix the bug it claimed to fix.
12130c8006