Revert "Fix redefination error"

This reverts commit f94175dc6d878530ee1ba0d1b9aec238e9dc38c2.
Revert de693e1dda1d88b8f3f3d04000858e076cbe7677

Change-Id: Ibd7ca411761cc33489100381915adb783319e1ef