Revert "Missed some changes in the last commit."

This reverts commit 2d5b2fdd117a932eb68da6634820c9c075e4e1a8.