Added back in removed code from revision 21 update.