Revert "modify singleton"

This reverts commit 7bb74ffb9b6de8790f9df8df894b7d2b60fcf45e.