Revert changes picked up from trunk.
Added method to get the size of the class