This reverts commit c11ff4bb & df67d352. Trying to make the change to the driver to avoid round-trip issues.