Comment 10 for bug 153526

This patch maintains the away fix and it's functionality from svn and the previous patch it would supersede and also eliminates the crasher when trying to apply a change by clicking on the 'Change' button.