Revert "Bug de None Type"

This reverts commit edcaa3655ccee34d3d27e15524ebc24f670d8ab9.