revert & fix "remove this for now" also fix build error