Revert to 9.1.0-BETA, it was a merge that gone bad