Revert "Update convention"