Revert constructor change