Removing this module feels out-of-scope for this PR.