revert r6278 and r6277 - if possible we should not keep the trunk dysfunctional for more than a few hours (I need alugrid)

[[Imported from SVN: r6280]]