This state transaction does not make sense, let's avoid it. Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Related: OS#4901
Related: OS#4870 Change-Id: I074f4496aa153b5f84e6ce85f413754efe64d831