Undo last MR (Ztautau)

Description of bug

Put back previous version of files before latest MR

Changes introduced

keywords fixes

Tests

Issues resolved

Already under production

Closes #

@fgiuli @cgutscho