@simong : Does this still need to be disabled? Or can we go ahead and enable/delete this?