Revert "Revert "Revert change again.""

This reverts commit 7947ecbd745363db1b2c037d9e5df23aa087ea66.