Revert change and fix build another way.