OK. Should we open a new bugzilla ticket for refactoring?
@ranbena ?