Reverted last changes to match upstream