Revert some stuff to vanilla behavior