undo some mistakenly-committed code