Revert "Remove specific changes of previous commit"

This reverts commit 0c91c7e2e5738fa2bfc313dc5ffc86d0803213ad.