be used as a cross-tool. Revert previous commit. Submitted by: Nikolai Lifanov <lifanov@mail.lifanov.com>