build: revert r44076