If you can revert these changes it would be nice.... it sucks that this code shuffled around for no reason.