I would like to make this change as a follow-up bug due to d206e4ea making changes to this code and adding unit tests against it.