Removed the part I told myself not to commit.