Remove workarounds for old, broken init behavior