b9d1ad8604
This reverts commit 7826d4ca2d.
Changing the parameter sizes breaks backward ABI.
Change-Id: Iff14b7c11294f0931f36fcfd42fff11a492d4205