0.9.8e EVP Workaround

This is related to #748, but is split out because it is a very annoying change and can be discussed separately.