seems like this change could have gone in alone.