Another casualty of #129