Revert previous commit. That was not the right place to fix this.

This reverts commit fa771591a18435ca48b02fe6f185c60575afaddd.