Remove strange 2.6 compatibility hacks
Require puppet 2.7+