Revert deletion of Factory so that third-party code continues to compile against the latest Hamcrest version