Rollback to 1.9.3