Fix (reversing bf86291)