Fix #679 - Headers only modified on same origin requests