Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
This reverts commit f712dc9a. It turns out this refactoring is not useful after all. Change-Id: I0145c907b3cc5ac9a30a59abcd719cb546c9bd3a