revert everything from WEB-7316 due to bug in wkhtmltopdf found with WEB-7930 ... sigh