Revert "Track Codefix SU"

This reverts commit 79dac06c809aff71f2e3c375b9f3fed38509ebcc
Merge "Revert "Track Codefix SU"" into jb42