[en] manually integrate changes that got overwritten :/