Revert "Fixed any errors that were from rebase"

This reverts commit 7ebe673d2e966856f6a032fd5bd7fce77b65c315.