Re-applying changes overwritten by 4.4 merge