Reverted commit c322a72.