This reverts commit dae24142. It is important to check the name of the method being called. Bug: 21869691