This reverts commit 8151a78aed. This breaks accounting memento, will figure out later a proper fix
8151a78aed