Fixed bug in swapped callback of AbstractDecorator. Instead of really swapping it re-added the old service instead of the new one.