Revert 318750d5

It didn't fix anything. The root cause of test failure is Puppet treating an integer
as a string in its ERB templates (except in the future parser).