Merge "Fix the build: Revert "Switching to the final PDF rendering library""