META: partial revert of ae2448f