re-add commented out code