This replaces the implementation with an equivalent one. Change-Id: I1343ddee9414a67906cd426b8381ddbace873894