Reverted some changes that made it into the repo prior to a full conversion

Signed-off-by: thevisad <thevisad@gmail.com>