revert everything from WEB-7316 due to bug in wkhtmltopdf found with WEB-7930 ... sigh
merge trunk to branch for revert of WEB-7316 (per WEB-7930)