Reverted patch (it was used for internal testing and was committed by accident)