reverting previous minor code cleanup, aka wthwit for real