Revert changes in zerista branch to match upstream development.