Revert commits made since forking, which are now on the adjacentTimeOverlaps branch and should have never been committed to master.