Revert "Remove duplicate stuff"

This reverts commit 8c4f055ebbeb7acbd3abf7bd5f3e099811b694cc.

Change-Id: I823fd6edd7f8c9d43a13866200e6bb66d47cef9f