This reverts commit e3ccbae309273900a42e30b606c15c873d57f1ea. There is a bug which is failing the test running on mac.