Getting the changes we need from Chris' personal repo into a Balihoo owned repo.