Revert "Merge branch '196770-qa-log-out-sometimes-fails-after-entering-the-ee-license' into 'master'"

This reverts commit c9c86caa, reversing
changes made to 6268ee84.