Revert Broken Merge

-Needs testing