#JC-1388: revert unnecessary changes in controller, view configurations and in header.txt.