reverted to previous version, retained puppet syntax fixes