Revert "Simplify conditions around merging pavlov options"

This reverts commit f9ca1bbfdcccc05b1844526b65b5fad63846c134.