adjusting. Forgot to remove them at the commit time, noticed by naddy@. Just verified that build goes fine on amd64.