Damn you cherry-pick!

Stop replacing large chunks of my code with omni's. You had no reason to...asshat