Remove differances from UPSTREAM code.