Revert [17900] as it doesn't harm to specify --target