Fix MCCP bug caused by improper buffer management.

This is to go on the release branch.