Updated to work with moltar/plenv modifications.