Revert weird changes