Revert SC troubleshooting commits