Revert "remove redundant definitions"

This reverts commit d14f61ac7f99d8c971a7633a3830f8e7036fc6fe.
Revert "Revert "remove redundant definitions""

This reverts commit 9dc32c194adddff0d5892dc289926cd2002fa076.