Revert "Revert "Revert "Revert "Toolkit Assignment""""

This reverts commit b3e01ebb20ed1d1241061d9c06168724afa54925.