Rollback since problems with Mac