Major performance fix - not an ideal solution for submitting back to AWS, but solves our problem until they can fix it.