Revert part of #702 to fix #704