Revert part of #6452

Attempt to fix #6542