Revert a few extraneous changes