Reverted changes on local situation detection