Reverting some refactor related to common transfer.