Revert b9a867affdea15dc23f305e888f682297c2d1189 : The breaking enchant is now unable to occur with random enchanting.
Merge remote-tracking branch 'origin/master' into version-1.7

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.