Revert "Toolkit Assignment"

This reverts commit e841bba0ae652d426cf7df487db128f2e8b0215a.