Revert "This branch was overwritten at some point, so I went back and found the changes"

This reverts commit 1fd7ffc8fb1b9080353d2e93b058d9fd56430ae1.