another insane batch of changes, prepare to revert