Revert premature bug fix for multiple instances

This reverts commit 5338b49f9bc2f4ebb45f2401ae9b61fdb0ce895d.