reverting a bunch of stuff which breaks ovation