Revert "Revert 1b544f4..f97e9b7"

This reverts commit fc50561918af2a79bc6232e02769aac6551e8259.
Revert fc50561..b8ad2c4

This rolls back to commit fc50561918af2a79bc6232e02769aac6551e8259.
New commit without locally-generated files