Unrevert commit a398ca6 and apply the proper fix.