another workaround for C++'s lack of proper overloading

Change-Id: I83f39c12a26e8acfe9a60d2ce9bd1b4b1b7c8c02