Revert "Avoid double initialization"

This reverts commit 8f8ce50e06d648ed4cfb9fb32ef7af4390949cf4.