Reverted async/apply SFINAE related changes