Bring upstream back in sync with published module

Apologies for the confusion!