Revert changes to singletons creation