PR has been merged, remove workaround