Revert Toolkit dupe fix (to be implemented later)