Backing out Elena's patch - abstraction violation