Revert "Merge pull request #1060 from rsvato/async"

This reverts commit 00f9aa8e9969fa3ad47aeffee983b10a00298dc8, reversing
changes made to b17aa3eaa1bfb542ce4828863c4a3b10cddab51e.