Revert to gems used in 1.3, except blacksmith