Added missing changes
Revert "Added missing changes"

This reverts commit 64a03ed1ef98d620b8717603c49972dc818eb3b3.