Revert "Source updates"

This reverts commit 46d506e2c92a9ce0567845a1d20640718689f704.