Reverting changes in getByKey that were accidently checked in due to commit# a2138112a167ca53d3da892683283ad3bd40107f