Revert "Minor local changes."

This reverts commit ded85a7cef32c2cbe5891070eb41b3b1fe8f06e3.