Revert "fixed 2040 patch after upstream commit"

This reverts commit 2130a3acfed560e72e22c196a792b33b2713c66e.