Bug 3161: Remove serialVersionUID to maintain backwards compatibility