Revert "Add helper function for updating bucket contents"

Reverting this for now, because it would require further changes
thanks to the zend signals tsrms-but-only-sometimes awesomeness.
Merge branch 'PHP-5.6'