Revert some stuff from the previous commit