This reverts commit 122706db9c. Would loose manipulators, will check for duplicates instead.
122706db9c