Rollback last change- fix was too hacky for my taste.