Adding back version 1 code.