Reverting stray changes from my merge of #464