Revert changes for issue 1013 which got overwritten, and a bug fix in pvq_core_enc