revert bus and L2 tweaks