Reverted to plexus components

Still no go, for some reason the real
realms are not picked up in UTs and 2 of them
fail