Revert "Fix a revert"

This reverts commit a922d3a6038be3f8d1efacbff924930c4de5f316.