Ensure that registry plugins added manually can be returned.

Closes #1986.