cec: and reverted the previous commit again (partially) cause it wouldn't compile...