Re-commit Josh's last checkin as merge seemed to fail.