Mostly revert master back to stable version