Revert 9b3652f..1446160

This rolls back to commit 9b3652f8c37d8fa590c833d6ee08adc0d1e74c65.
resync