Revert deeb6ee..aacf3e0

This rolls back to commit deeb6ee97cd2bfd77c62de3c9aabf89622e4f48d.
sync