Build Puppet: back out 663861a97adb1e8e4465b9ffd9506e5996438ece for potential bustage (#605)