Revert "This commit removes changes that were made to the module but later determined to be unnecessary."

* Cleans up an earlier failed attempt to remove changes that are no longer wanted.

This reverts commit 62f4473bdfddd9fe819e1de5a5be661521db0913.