Revert "Used lazy initialization"

This reverts commit d38ddc85b522ece82a2701ff51d08332a7d7d332.