Revert some non-working changes