I think this might conflict with the recent changes where we've gone away from StoredElement and use Serializable.