Reverting a commit from yesterday to fix bugs