CB-5971: This would have been a good first bug, too bad