Add back some deleted code, but cleaner