Recover another bugfix from its original status since it's in another pull request already