remove erroneous class call

Change-Id: I56be8881ca7942e78c3cfa1ded9b6ea3065ff8ba
Merge "remove erroneous class call" into production