WP-4587 revert some more features