Revert "ID clash, IDs should be unique - solved by removing one of them."

This reverts commit 80f0a16a87dad55fb4b4f89031700ed9b3dd65ce.