Note: Some of the previous patches have had two bugs that have been fixed
in this patch.