reverting to pre-uniqueness bugs