This reverts commit fff16807c2e6c64d671b2f6b7b3ae76f5e16e38d. We no longer need this workaround after 053478bbd0ae5329ea7993261225e6541f728858.
This reverts commit fff16807c2e6c64d671b2f6b7b3ae76f5e16e38d. We no longer need this workaround after 053478bbd0ae5329ea7993261225e6541f728858.