Revert to hamcrest 1.1