Revert "Porting over changes from the local branch to a remote fork"

This reverts commit f8d704c85796382b32d93154332fd7ccf16dfd55.