Revert d737b62..fa45a33

This rolls back to commit d737b62f7bc73d1c275ee081a0dd68c32f140b42.
Revert back to initial sync