Revert "Non-Functional Change"

This reverts commit 3cea7b8f953187b378d9f98ecf619d5e8151cfe0.