Back out the randkey changes (revision 1.11)