revert #398

this one won't compile; reverting it for now