Revert some faulty code