Decided to undo the last change to avoid backward compatibility