And once again, did that the wrong way around.  Whoops.
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>