This reverts commit 819758f4.

A proper fix is now available, therefore reverting this workaround.