Revert 658

See #680