Revert: 'Fix build error'