Update for "44ac3bee598da3145f69f9f25c96498af82f3e69"