Fix mistaken class registration

Change-Id: Ic90d166a0df9012fcdb20ab3999a5ab620bfb22f