For #275 #279 revert to snapshot until RC
For #275 #279 ensure singletons are only post-initialized once regardless of dependency chain.