Revert"linro build commit"