Revert "Remove obsolete modified components"

This reverts commit 3b477393c613b3a8fe35944dcbf02787474be7e0.