Revert "Jacobs local commit"

This reverts commit d4144fee6f0ff9c20ca4240242b45c36974cfb0e, reversing
changes made to 893281d34be1e03f5daa826c5b159f7317295c48.