Revert experimental changes