UP-3905:  Clean up the 'sticky' header implementation