3.3x compat, rev #2