Fix Python 3.6.9 issue encountered due to type checking here. Will add back in follow up. This reverts commit 1f47fee2.