Revert "More type fixes"
Revert "More type fixes"

This reverts commit 5d31e15a622b0d4b0ae6bee6e89703809abc11fd.

Tiberriver256/Tiberriver256.GitHub.io,Tiberriver256/Tiberriver256.GitHub.io,Tiberriver256/Tiberriver256.GitHub.io