Was causing assertion fails in UnregisterSingleTarget, further research into the issue is needed. This reverts commit d44dd097. Reopens #42