Revert last merge (for 2.0 branch compatibility)