reverted quick fix.  todo: how to handle quick fixes in git..