last commit was a bit rash, revert some bits of it