Revert "Attempt another fix."

This reverts commit 63e826455c17161c22e17b3f2f2f0cd764c32156.