Revert "moved singleton check to appropriate place"

This reverts commit e6ec38efc73116326cd679fb0ec9369372e25eac.