r21918: Reverting this change as it is now causing aborts() in