Issue #WP-1638: Skip step 3