diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4be98c29..27ef405e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic
 Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] - 2020-12-12
+
+### Changed
+
+- Changed part of the build process considering [this Wine
+  bug](https://bugs.winehq.org/show_bug.cgi?id=49138). Building with Wine 5.7
+  and 5.8 required a change, but that change now breaks builds using Wine 6.0
+  and up, so this change has been reverted.
+
 ## [2.2.1] - 2020-12-12
 
 ### Fixed
diff --git a/src/wine-host/group-host.cpp b/src/wine-host/group-host.cpp
index d5fa2aef..03f7ceb4 100644
--- a/src/wine-host/group-host.cpp
+++ b/src/wine-host/group-host.cpp
@@ -35,12 +35,8 @@
  * After that initialization step both the regular individual plugin host and
  * this group plugin host will function identically on both the plugin and the
  * Wine VST host side.
- *
- * The explicit calling convention is needed to work around a bug introduced in
- * Wine 5.7: https://bugs.winehq.org/show_bug.cgi?id=49138
  */
-int __cdecl __attribute__((visibility("default")))
-main(int argc, char* argv[]) {
+int __attribute__((visibility("default"))) main(int argc, char* argv[]) {
     set_realtime_priority();
 
     // Instead of directly hosting a plugin, this process will receive a UNIX
diff --git a/src/wine-host/individual-host.cpp b/src/wine-host/individual-host.cpp
index ef0b30b6..3be1b9ae 100644
--- a/src/wine-host/individual-host.cpp
+++ b/src/wine-host/individual-host.cpp
@@ -28,12 +28,8 @@
  * This is the default VST host application. It will load the specified VST2
  * plugin, and then connect back to the `libyabridge.so` instance that spawned
  * this over the socket.
- *
- * The explicit calling convention is needed to work around a bug introduced in
- * Wine 5.7: https://bugs.winehq.org/show_bug.cgi?id=49138
  */
-int __cdecl __attribute__((visibility("default")))
-main(int argc, char* argv[]) {
+int __attribute__((visibility("default"))) main(int argc, char* argv[]) {
     set_realtime_priority();
 
     // We pass the name of the VST plugin .dll file to load and the base