revert all experimental changes