The issue with secure headers and domain mapping is broken again.

It was fixed in v1.6.4 under issue number #2120 but since updating to v1.7 this evening the problem has resurfaced